From: Kenichi Handa <handa@m17n.org>
Date: Thu, 7 Jul 2011 05:12:06 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2495^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=049e6d49e08326731e64d08bd37722627c324178;p=emacs.git

merge trunk
---

049e6d49e08326731e64d08bd37722627c324178